Split clickhouse admin server #6837
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also, split the clients and remove the dependency of clickhouse-admin-api from nexus.
|
I'm pretty sure I have to fix some omicron-pkg and smf stuff here as well. I'll do that shortly. |
sunshowers
approved these changes
Oct 11, 2024
|
|
||
| /// We separate the admin interface for the keeper and server APIs because they |
There was a problem hiding this comment.
First paragraph of doc comments should be short (a lint for this is coming in Rust 1.83.) Could you just add something simple?
There was a problem hiding this comment.
Thanks for the tip! Done in 0a2e28b
| @@ -95,3 +77,28 @@ pub trait ClickhouseAdminApi { | |||
| rqctx: RequestContext<Self::Context>, | |||
| ) -> Result<HttpResponseOk<ClickhouseKeeperClusterMembership>, HttpError>; | |||
| } | |||
|
|
|||
| /// We separate the admin interface for the keeper and server APIs because they | |||
There was a problem hiding this comment.
Done in 0a2e28b
| @@ -17,7 +17,7 @@ | |||
| </dependency> | |||
|
|
|||
| <exec_method type='method' name='start' | |||
| exec='ctrun -l child -o noorphan,regent /opt/oxide/clickhouse-admin/bin/clickhouse-admin run -c /var/svc/manifest/site/clickhouse-admin/config.toml -a %{config/http_address} -l %{config/ch_address} -b %{config/ch_binary} &' | |||
| exec='ctrun -l child -o noorphan,regent /opt/oxide/clickhouse-admin-keeper/bin/clickhouse-admin-keeper run -c /var/svc/manifest/site/clickhouse-admin-keeper/config.toml -a %{config/http_address} -l %{config/ch_address} -b %{config/ch_binary} &' | |||
There was a problem hiding this comment.
Could I ask you to use the long version of command arguments here? ^_^
There was a problem hiding this comment.
Done in 0a2e28b
| </dependency> | ||
|
|
||
| <exec_method type='method' name='start' | ||
| exec='ctrun -l child -o noorphan,regent /opt/oxide/clickhouse-admin-server/bin/clickhouse-admin-server run -c /var/svc/manifest/site/clickhouse-admin-server/config.toml -a %{config/http_address} -l %{config/ch_address} -b %{config/ch_binary} &' |
There was a problem hiding this comment.
Done in 0a2e28b
|
Thanks for the great review @sunshowers! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6779
Fixes #6829